Merge proposals dependent on lp://qastaging/~richstyles/emacs/main

lp://qastaging/~richstyles/emacs/main has no merge proposals.