Merge proposals dependent on lp://qastaging/~mattbrown/moovida/bugfixes

lp://qastaging/~mattbrown/moovida/bugfixes has no merge proposals.