Merge pull request #1700 from aTanW/master