Usergrid 2830

This is what has been tagged for 2.0.7 release.