Merge branch 'MDL-34426-wip6' of git://github.com/mouneyrac/moodle into MDL-34426-master

Conflicts:
	lang/en/auth.php
	lib/authlib.php
	lib/db/install.xml
	lib/db/upgrade.php
	user/editlib.php
	version.php