Merge branch 'release/v2.1.0'
Merge branch 'release/v2.1.1'
heading mixin fix
Merge branch 'hotfix/headings2' into develop