Fix build error
Merge branch 'feature-libpng-integration' into release-1.3

Conflicts:
	configure.ac
Minor fix
Merge branch 'feature-libpng-integration' into release-1.3

Conflicts:
	configure
	configure.ac