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


This closes #36