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

This closes #149

Applying patch with thanks to Chad Zobrisky

chirino/activemq,chirino/activemq,chirino/activemq,chirino/activemq,chirino/activemq,chirino/activemq,chirino/activemq,chirino/activemq,chirino/activemq,chirino/activemq