Applied RAVE-1068 from Stanton Sievers

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