Scott's Request on maint
Merge branch 'master' of https://github.com/hardik-panchal/brilliant