Merge pull request #3927 from qrtt1/master