Merge branch 'master' into 2.1_release

1 job for 2.1_release in 1 minute and 35 seconds (queued for 1 second)