(cherry picked from commit1783676a64) (cherry picked from commitb83c20df65) Conflicts: CHANGES config.h.in configure configure.in
(cherry picked from commit1783676a64) (cherry picked from commitb83c20df65) Conflicts: CHANGES config.h.in configure configure.in