Applying patch from Stanton Sievers for RAVE-1086

git-svn-id: http://svn.apache.org/repos/asf/rave/trunk@1569475 13f79535-47bb-0310-9956-ffa450edef68
Applied patch from Stanton Sievers RAVE-1085

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