docpad ~6.31.6
merged