SERVER-14387 fix compile on OS X 10.8 C++11 DEBUG
Merge remote-tracking branch 'upstream/master'