Update ChangeLog.

Conflicts:

	ChangeLog
Add build files.
Merge branch 'master' into v1.6