66f56b1 Merge branch 'master' into docpad-6.x