Commit 05603850 authored by Ron Rahaman's avatar Ron Rahaman

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

Contains configure scripts, which were a hotfix

Conflicts:
	.gitignore
parents 7365c202 63d87017
Pipeline #8978 failed with stages