TryGhost/Ghost — pull request #3249 by johan-- (2014-07-12 09:18:37+00:00)
Title: Merge pull request #1 from TryGhost/master

Sync with upstream