Merge pull request #3359 from alexgrin/master