Update to AppEngine 1.8.4
Merge branch 'master' into hashtags