Commit d99a3044 authored by David Diederich's avatar David Diederich
Browse files

Merge remote-tracking branch 'origin/master' into 59-correct-internal-versioning

Conflicts:
	NOTICE
parents 7a7aa46f 6d5c78a0
Pipeline #53306 failed with stages
in 53 minutes and 31 seconds