Merge branch 'master' into subtree

author Niki Roo <niki@nikiroo.be>

Tue, 19 May 2020 19:16:46 +0000 (21:16 +0200)

committer Niki Roo <niki@nikiroo.be>

Tue, 19 May 2020 19:16:46 +0000 (21:16 +0200)
author Niki Roo <niki@nikiroo.be>
Tue, 19 May 2020 19:16:46 +0000 (21:16 +0200)
committer Niki Roo <niki@nikiroo.be>
Tue, 19 May 2020 19:16:46 +0000 (21:16 +0200)
diff --cc streams/ReplaceInputStream.java
Simple merge
diff --cc test_code/ReplaceInputStreamTest.java
Simple merge
diff --cc ui/UIUtils.java
Simple merge
author	Niki Roo <niki@nikiroo.be>
	Tue, 19 May 2020 19:16:46 +0000 (21:16 +0200)
committer	Niki Roo <niki@nikiroo.be>
	Tue, 19 May 2020 19:16:46 +0000 (21:16 +0200)
		1	2
streams/ReplaceInputStream.java	patch \|	diff1 \|	diff2 \|	blob \| history
test_code/ReplaceInputStreamTest.java	patch \|	diff1 \|	diff2 \|	blob \| history
ui/UIUtils.java	patch \|	diff1 \|	diff2 \|	blob \| history