Merge branch 'release/v2.1.4' into develop
quickfix heading mixin to enable unique extends
bumped up version to v2.1.5
Merge branch 'release/v2.1.5'