Fixed bug that occurred when no file could be loaded for the requested class (and the class was not in the registered namespaces
Merge remote-tracking branch 'origin/alpha' into alpha