Patched up.
Merge branch 'master' into api-1.1
Merge branch 'api-1.1' into api-1.2