Merge pull request #1534 from aTanW/master