Fixed line feeds
Fixed line feeds
Merge branch '1.0-master' into 1.0-dev

Conflicts:
	ChangeLog.txt