release date
Merge branch 'master' into beta

Conflicts:
	ChangeLog
ChangeLog synchronized with ics branch
Merge branch 'master' into beta