Usergrid 2298

All tests pass locally on Mac OS X.