Copied changes from FifthGear
Merge remote-tracking branch 'origin/master' into 1.5

Conflicts:
	API.php