Merge branch 'rc3.1-to-master-candidate' into 'master'

Rc3.1 to master candidate

See merge request !16
1 job for master in 1 minute and 51 seconds (queued for 24 seconds)