Fixes trendwerk/trendpress#135
Merge branch 'master' of https://github.com/trendwerk/trendpress-child