Merge pull request #1101 from jariq/master