1.2.2
Merge remote-tracking branch 'origin/master'

Conflicts:
	update/ajax.php
1.2.2