Merge branch 'mongoose_test'
Merge branch 'master' into mongoose_test