SERVER-12356 Error object returned to shell is displayed as [object Object]
Merge remote-tracking branch 'upstream/master'