manually apply / munge diff in #687
Merge pull request #688 from flapjack/687_1.2_event_mirroring

make 0.9 compatible with new event mirroring logic in 1.2 (fixes #687)