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

Contains configure scripts, which were a hotfix

Conflicts:
	.gitignore
7 jobs for develop
latest
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