Fixed wrong method calls
Updated version
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/providers.php