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