Merge branch 'master' into convert-oc_config

Conflicts:
	lib/config.php
	lib/setup.php