Noted bevry/docpad#767 and bevry/docpad#807