Reviewed and applyed Stefan Zoerner's patch for DIREVE-240 here: http://issues.apache.org/jira/browse/DIREVE-240
Changed paths: