Merge branch 'shotgun' into 'master'

shotgun benchmark

See merge request !5
3 jobs for master
in 22 seconds and was queued for 1 second