Slight refactoring.
Merge branch 'master' into staging