Update for shape defaults and handling of embedded html tags
Update for shape defaults and handling of embedded html tags, release
Merge branch 'feature/oasis-style' into gh-pages