Merge branch 'development'
App Engine ref fix
Merge branch 'master' into development