Merge proposals dependent on lp:~kreeblah/smpq/macos_compilation_fix

lp:~kreeblah/smpq/macos_compilation_fix has no merge proposals.