Merge pull request #3557 from bunkerity/dev