Merge branch 'master' into de3005
Merge branch 'de3005' of github.com:inbloomdev/datastore into de3005