Merge pull request #1914 from kasthack/master