Merge pull request #1452 from clebertsuconic/master-fix

HORNETQ-1242 :