Merge branch 'ltlibintl' into new-master
Merge branch 'bug-695604' into new-master
Merge branch 'bug-997359' into new-master

Conflicts:
	ChangeLog
Merge branch 'tap' into new-master