Merge remote-tracking branch 'upstream/master'

author Sarah Hoffmann <lonvia@denofr.de>

Fri, 9 Jun 2017 19:54:05 +0000 (21:54 +0200)

committer Sarah Hoffmann <lonvia@denofr.de>

Fri, 9 Jun 2017 19:54:05 +0000 (21:54 +0200)
author Sarah Hoffmann <lonvia@denofr.de>
Fri, 9 Jun 2017 19:54:05 +0000 (21:54 +0200)
committer Sarah Hoffmann <lonvia@denofr.de>
Fri, 9 Jun 2017 19:54:05 +0000 (21:54 +0200)
diff --cc lib/lib.php
Simple merge
diff --cc utils/update.php
Simple merge
author	Sarah Hoffmann <lonvia@denofr.de>
	Fri, 9 Jun 2017 19:54:05 +0000 (21:54 +0200)
committer	Sarah Hoffmann <lonvia@denofr.de>
	Fri, 9 Jun 2017 19:54:05 +0000 (21:54 +0200)
		1	2
lib/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history
utils/update.php	patch \|	diff1 \|	diff2 \|	blob \| history