Commit 47e4f146 authored by Bas Lijnse's avatar Bas Lijnse

Merge branch 'master' into 259-editors-need-refinement

parents a3d349db 730dec44
Pipeline #17054 passed with stage
in 3 minutes and 35 seconds