merge from require branch

git-svn-id: http://svn.apache.org/repos/asf/rave/trunk@1503074 13f79535-47bb-0310-9956-ffa450edef68
merge fix

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