Applied Stefan Zoerner's patch from DIREVE-256 here http://issues.apache.org/jira/browse/DIREVE-256.
Changed paths: