Merge pull request #229 from apache/WW-5391-velocity-ext