Fixes #234
Merge branch 'master' of https://github.com/trendwerk/trendpress