Merge pull request #1660 from pyed/master