Jekyll 1.4.2
Sync with upstream