Merge branch 'dev'
git tag bump
Merge branch 'dev' of github.com:jswebtools/language-ecmascript into dev
resolved merge conflict
ver bumps