normalized init.pp header to match the rest
Merge branch 'testing' into production
Merge branch 'testing' into production
reverted to original class loading mechanism