Merge pull request #3578 from bunkerity/staging