Allow older non-Apple GCCs to build things
Merge remote-tracking branch 'mxcl/master'