Fix for bad return in load class for dynamic loaders
Merge branch 'master' into website