Merge PR#19 from 'sieverssj/RAVE-1275'
Auto-merge | Integrating changes from apache/master