Merge pull request #1 from danhooper/staging

Staging
Merge branch 'staging'