Merge branch 'hotfix/wp-issues'
Merge branch 'master' of https://github.com/shawnsandy/theme-starter
Merge branch 'master' of https://github.com/shawnsandy/theme-starter