Merge branches 'git-staging' and 'master' into git-develop

Need to commit
Merge branch 'master' into develop

Fixing