Do not skip 5.0.0
Merge branch 'master' into appengine
Do not skip 5.0.0