Merge in of specification from master gh-pages