Merge branch 'master' into beamline

2 jobs for beamline
latest
Name Stage Failure
failed
rubocop Test There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log
failed
rspec Test There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log