Merge remote-tracking branch 'upstream/master'

author Sarah Hoffmann <lonvia@denofr.de>

Fri, 20 Jul 2018 20:28:54 +0000 (22:28 +0200)

committer Sarah Hoffmann <lonvia@denofr.de>

Fri, 20 Jul 2018 20:28:54 +0000 (22:28 +0200)
author Sarah Hoffmann <lonvia@denofr.de>
Fri, 20 Jul 2018 20:28:54 +0000 (22:28 +0200)
committer Sarah Hoffmann <lonvia@denofr.de>
Fri, 20 Jul 2018 20:28:54 +0000 (22:28 +0200)
diff --cc CMakeLists.txt
Simple merge
diff --cc utils/update.php
Simple merge
author	Sarah Hoffmann <lonvia@denofr.de>
	Fri, 20 Jul 2018 20:28:54 +0000 (22:28 +0200)
committer	Sarah Hoffmann <lonvia@denofr.de>
	Fri, 20 Jul 2018 20:28:54 +0000 (22:28 +0200)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
utils/update.php	patch \|	diff1 \|	diff2 \|	blob \| history