Add ChangeLog entry for fix of bug #4184

Signed-off-by: Marc Delisle <marc@infomarc.info>
Fix merge conflict

Signed-off-by: Marc Delisle <marc@infomarc.info>