1.2.3
Merge commit 'f0f6e31e22dcb6e3a8039bf9dad12ac132460c56'

Conflicts:
	code-freeze.php
	js/func.js
	readme.txt