Merge remote-tracking branch 'upstream/master'

author Sarah Hoffmann <lonvia@denofr.de>

Fri, 31 Jan 2020 16:54:41 +0000 (17:54 +0100)

committer Sarah Hoffmann <lonvia@denofr.de>

Fri, 31 Jan 2020 16:54:41 +0000 (17:54 +0100)
author Sarah Hoffmann <lonvia@denofr.de>
Fri, 31 Jan 2020 16:54:41 +0000 (17:54 +0100)
committer Sarah Hoffmann <lonvia@denofr.de>
Fri, 31 Jan 2020 16:54:41 +0000 (17:54 +0100)
diff --cc CMakeLists.txt
Simple merge
diff --cc utils/update.php
Simple merge
author	Sarah Hoffmann <lonvia@denofr.de>
	Fri, 31 Jan 2020 16:54:41 +0000 (17:54 +0100)
committer	Sarah Hoffmann <lonvia@denofr.de>
	Fri, 31 Jan 2020 16:54:41 +0000 (17:54 +0100)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
utils/update.php	patch \|	diff1 \|	diff2 \|	blob \| history