Inbetween commit.
Merge branch 'develop' of https://github.com/trendwerk/trendpress-child into develop