Merge pull request #3445 from lanoxx/master