Fix support on Mac using latest Xcode compiler.
Merge remote-tracking branch 'upstream/master'