Run GenerateSQL
Merge branch 'master' into schema-changes-2013-10-15