Added a staging key
Merge branch 'master' into staging