6f2d153 fix merge in docpad coffee