Bump generator to production-2013-07-17
Bump runtime to production-2013-07-17
Merge branch 'staging' into production