I checked in some changes to Velocity processing this morning to trunk. If anyone depends on sakai-velocity-tools in their custom or contrib tools, they will need a small update to continue working OOTB against latest trunk. Please contact me for help; the changes are minimal and easy to implement. --Sam