Merge pull request #3694 from bunkerity/staging