Merge pull request #1937 from lewurm/master