457bddfc2a
(cherry picked from commit 4749a0058b27274a95c5a798e339c7299cdf890e) Conflicts: ChangeLog
(cherry picked from commit 4749a0058b27274a95c5a798e339c7299cdf890e) Conflicts: ChangeLog