applying patch from Jacob in DIREVE-169 here http://issues.apache.org/jira/browse/DIREVE-169
Changed paths: