Plain Diff
am: fd56dc41 -s ours * commit 'fd56dc41': Add macro to call event logger for errors. DO NOT MERGE
mentioned in commit 68ac0bee