Merge pull request #1940 from lewurm/master