Merge branch 'feature/user-configurable-mascot' into 'develop'