Merge proposals dependent on lp://qastaging/~patrickmwright/mago/patrickmw-struct

lp://qastaging/~patrickmwright/mago/patrickmw-struct has no merge proposals.