[load,bugfix][s]: fix for file loading bug introduced in 201e3918c7982ac3231133d67bb2e847f87d6773.
Merge branch 'master' into gh-pages