Fix support for user defined extensions.
Merge branch 'user-settings-'
Merge branch 'master' into simplify-patterns