Merge branch 'refs/heads/preparing_for_app_engine' into dev
Merge branch 'refs/heads/dev'