Merge branch 'master' into feature/autosink

author Paul Brossier <piem@piem.org>

Thu, 2 Jul 2020 13:34:26 +0000 (15:34 +0200)

committer Paul Brossier <piem@piem.org>

Thu, 2 Jul 2020 13:34:26 +0000 (15:34 +0200)
author Paul Brossier <piem@piem.org>
Thu, 2 Jul 2020 13:34:26 +0000 (15:34 +0200)
committer Paul Brossier <piem@piem.org>
Thu, 2 Jul 2020 13:34:26 +0000 (15:34 +0200)
diff --cc .circleci/config.yml
Simple merge
diff --cc .travis.yml
Simple merge
diff --cc azure-pipelines.yml
Simple merge
diff --cc wscript
Simple merge
author	Paul Brossier <piem@piem.org>
	Thu, 2 Jul 2020 13:34:26 +0000 (15:34 +0200)
committer	Paul Brossier <piem@piem.org>
	Thu, 2 Jul 2020 13:34:26 +0000 (15:34 +0200)
		1	2
.circleci/config.yml	patch \|	diff1 \|	diff2 \|	blob \| history
.travis.yml	patch \|	diff1 \|	diff2 \|	blob \| history
azure-pipelines.yml	patch \|	diff1 \|	diff2 \|	blob \| history
wscript	patch \|	diff1 \|	diff2 \|	blob \| history