Merge pull request #37 from gpazo/master

fix from master/20554 branch
Merge remote-tracking branch 'QTCLIENT/master'