Merge remote-tracking branch 'upstream/master'

author Sarah Hoffmann <lonvia@denofr.de>

Sun, 15 Oct 2017 16:08:25 +0000 (18:08 +0200)

committer Sarah Hoffmann <lonvia@denofr.de>

Sun, 15 Oct 2017 16:08:25 +0000 (18:08 +0200)
author Sarah Hoffmann <lonvia@denofr.de>
Sun, 15 Oct 2017 16:08:25 +0000 (18:08 +0200)
committer Sarah Hoffmann <lonvia@denofr.de>
Sun, 15 Oct 2017 16:08:25 +0000 (18:08 +0200)
diff --cc lib/Geocode.php
Simple merge
diff --cc lib/lib.php
Simple merge
author	Sarah Hoffmann <lonvia@denofr.de>
	Sun, 15 Oct 2017 16:08:25 +0000 (18:08 +0200)
committer	Sarah Hoffmann <lonvia@denofr.de>
	Sun, 15 Oct 2017 16:08:25 +0000 (18:08 +0200)
		1	2
lib/Geocode.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history