release date
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta

Conflicts:
	ChangeLog