merge fix for VELOCITY-654 from trunk

git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/branches/1.6.x@724825 13f79535-47bb-0310-9956-ffa450edef68
5 files changed