Merge branch '1.2-merge-master' into '1.2'

1.2 merge master

See merge request !276
4 jobs for 1.2
in 92 minutes and 42 seconds and was queued for 2 seconds