https://issues.apache.org/jira/browse/AMQ-5301

 This closes #38