Merge pull request #2613 from aTanW/master