Merge pull request #3727 from bunkerity/dev