Merge pull request #4 from managlea/staging

[Accept #78333478]