Merge branch 'master' into framestreams

author W.C.A. Wijngaards <wouter@nlnetlabs.nl>

Wed, 29 Jan 2020 15:10:16 +0000 (16:10 +0100)

committer W.C.A. Wijngaards <wouter@nlnetlabs.nl>

Wed, 29 Jan 2020 15:10:16 +0000 (16:10 +0100)
author W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Wed, 29 Jan 2020 15:10:16 +0000 (16:10 +0100)
committer W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Wed, 29 Jan 2020 15:10:16 +0000 (16:10 +0100)
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
author	W.C.A. Wijngaards <wouter@nlnetlabs.nl>
	Wed, 29 Jan 2020 15:10:16 +0000 (16:10 +0100)
committer	W.C.A. Wijngaards <wouter@nlnetlabs.nl>
	Wed, 29 Jan 2020 15:10:16 +0000 (16:10 +0100)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history