This closes #147
This closes #147

Merge branch AMQ-5982

Thanks to Chad Zobrisky

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