Merge branch 'master' into shortcuts
allow config loading without explicit class imports
Merge branch 'shortcuts'