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

 This closes #39