Merge pull request #1013 from mpdude/patch-3