Merge branch 'master' into country

Conflicts:
	lib/Catalol/Client.php