Import 1.4.16
Import 1.4.17
Merge tag 'v1.4.16'
Merge tag 'v1.4.17'

Conflicts:
	Makefile.in
	lib/config.hin