Freezying v1.2.3
Merge branch 'master' into devel