HORNETQ-1248: Merging PR#1233 from master branch

See discussion here : https://github.com/hornetq/hornetq/pull/1233