Merge changes
Merge branch 'sas_badging' of https://github.com/sassoftware/configuration into sas_badging