Add autoload-mappings for quickrun
Merge branch 'master' into mac