Unified autoloading
Merge pull request #2867 from WouterJ/issue_2331

Unified autoloading in Sf2 <> Sf1 article