fixed warning about unused argument in err.c
Merge branch 'release-1.4'

Conflicts:
	DESCRIPTION
Merge branch 'real_master'