Minor change to force a new travis build
Merge branch '1.6' into 1.7

Conflicts:
	ChangeLog
Merge branch '1.7' into 1.8