Merge branch 'master' into 491-plugin-configuration-in-the-admin-panel

17 jobs for 491-plugin-configuration-in-the-admin-panel in 8 minutes and 32 seconds (queued for 3 minutes and 13 seconds)