David Bremner <david@tethera.net> writes:

> Squashed sounds good to me too. Sorry I'm too lazy/busy at the moment to
> do it myself.

I tested the attached and it's working as expected.  Sent as an
attachment to preserve author information.