Code review comment for lp:~robertcarr/mir/1233944-addendum

> As discussed on IRC - this is already merged into the development-branch,
> so it's OK to merge straight into trunk to save time doing the double merge.

Although this will probably work fine in most cases, it complicates the history/relationship between lp:mir and the development-branch, making more difficult to figure out what's in each branch that's not in the other. I suggest that we don't make a habit of this, and do the double merge (fix=>devel=>lp:mir) in the future. Doing so keeps things conceptually clean. If we need to fast track we can perform one of the merges manually (i.e. avoiding a second CI run).