Merge branch 'ci'

1 job for master in 27 minutes and 44 seconds (queued for 3 seconds)