Import v1.5.22
Merge tag 'v1.5.22'

Import v1.5.22

Conflicts:
	Makefile.in
	cdemo/configure
	configure