Add @clarle as a committer
Merge branch 'master' into dev-master
Merge branch 'dev-master' into dev-3.x