Fixes #207
Merge branch 'hotfix/shortcodes' into 2.0
Merge branch '2.0' of https://github.com/bigspring/monolith into 2.0