Merge remote-tracking branch 'upstream/master' into develop

Contains configure scripts, which were a hotfix

Conflicts:
	.gitignore
7 jobs for develop
latest
Status Job ID Name Coverage
  Build Libmesh
failed #48904
build_libmesh_job

 
  Configure Giraffe
skipped #48905
configure_giraffe_job
 
  Build Giraffe
skipped #48906
build_giraffe_job
 
  Run Giraffe Serial
skipped #48907
run_giraffe_serial_job
 
  Verify Giraffe Serial
skipped #48908
verify_giraffe_serial_job
 
  Run Giraffe Parallel
skipped #48909
run_giraffe_parallel_job
 
  Verify Giraffe Parallel
skipped #48910
verify_giraffe_parallel_job
 
Name Stage Failure
failed
build_libmesh_job Build Libmesh There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log