update

edit
Merge remote-tracking branch 'origin/master'

Conflicts:
	smart_syntax.php