Spell check
Merge remote-tracking branch 'kas/master'

Conflicts:
	objects.php