Merge commit 'ab9630b52388eb5cb881b3a342d1972f4d7d89fa'

Conflicts:
	giftcard/se/selp02m.php