Merge pull request #910 from paladox/patch-1