Merged changes from 0.21.1 branch back to trunk:

git-svn-id: https://svn.apache.org/repos/asf/rave/trunk@1479999 13f79535-47bb-0310-9956-ffa450edef68