Merge pull request #1733 from stangri/master