Fix file loading

Forgot that other plugins besides requirejs load files too.
Merge branch 'fix-file-loading' into develop