Merge pull request #1260 from khellang/patch-2