commit for SL
Merge commit 'd0d56eec3a26d9de0483a31dd243cfb374c12153'

Conflicts:
	ui/select.php