Merge proposals dependent on lp://staging/~brandontschaefer/compiz/c++11-std-name-fix

lp://staging/~brandontschaefer/compiz/c++11-std-name-fix has no merge proposals.