Merge branch 'safe'

6 jobs for master in 3 minutes and 31 seconds (queued for 45 seconds)