Fixed issue where nested shortcodes wouldn't run
Merge branch 'hotfix/1.1.2'