Fix for CPP-68
Merge branch 'master' into dev to avoid stalls in test suite