Merge branch 'master' of https://github.com/mhoofman/wordpress-heroku into soundcloud-shortcode