Merge pull request #1 from TryGhost/master

Sync with upstream