Upgrade to Jekyll 3 (cherry picked from commit 5e3959e071)
5e3959e071
(cherry picked from commit cf73de9459)
cf73de9459