fixes the -partly badly loaded objects- problem
Merge branch 'master' into addon