Merge branch 'master' into staging
Merge branch 'staging' of https://github.com/Orasi/blue-source into staging