Merge branch 'prepare-1.3' into 'master'

Prepare 1.3

See merge request !405
4 jobs for master
in 1 minute and 54 seconds and was queued for 2 seconds