SERVER-13582 another attempt to fix server6733.js
Merge remote-tracking branch 'upstream/master'