Merge origin/master

Conflicts:
	toolkit/Toolkit.php