Merge in of specification from master gh-pages
Merge in of specification from master gh-pages