Backport fixes from trunk.
Backport GCC fix from trunk.
Merge branch 'joyent/feature/miscfix/2013Q2' into joyent/release/2013Q2_multiarch

Conflicts:
	math/mpcomplex/inplace.mk
	math/mpfr/inplace.mk