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