107f37f Merge branch 'feature_unify' into docpad