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