Friendlier DI for minification compatability
Merge branch 'NotBobTheBuilder-master'