Date was wrong (oh well)
Merge branch '1.6' into 1.7

Conflicts:
	ChangeLog
Set release date to today.