Merge branch 'master' into develop-1.3.0

1 job for develop-1.3.0
in 12 minutes and 6 seconds, using 0 compute credits, and was queued for 1 minute and 9 seconds