Allow building for mac integration with gcc-4.8
A truly ancient bug, discovered with an Xcode-5.1 compiler warning.
Merge remote-tracking branch 'upstream/master'