8c3a16b Merge branch 'feature_unify' into docpad