Refactor to be namespaced and not use legacy MVC
Merge branch 'master' into namespace
Merge branch 'master' into namespace
Merge remote-tracking branch 'origin/master' into namespace