Release of new multi-shape support
Merge branch 'feature/oasis-style' into gh-pages