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