Merge pull request #1225 from Mailaender/patch-1