Sync with latest Jekyll and contributors from Maceio