Merge proposals dependent on lp://qastaging/~michaelh1/pcemu/trunk

lp://qastaging/~michaelh1/pcemu/trunk has no merge proposals.