shakespeare 1.2/version bumps
Scaffolding tweak
platform update
Merge branch 'master' into wai-2.0