HORNETQ-1248: Merging PR#1233 from master branch
Merge pull request #1250 from mchaplin/2.3.x

HORNETQ-1248: Merging PR#1233 from master branch