Autoloader now does some trimming on the namespace.
Merge remote-tracking branch 'origin/develop' into develop