Merge branch 'boosh-mongo_duplicate_key_errors' into develop