Commit ae8623a2 authored by Bas Lijnse's avatar Bas Lijnse

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

parents 16e30a0c ef337e8b
Pipeline #19582 passed with stage
in 5 minutes and 35 seconds