Merge pull request #1365 from sorki/patch-1