Master build

[Jonathan Gallimore]

I'm aware of the latest test failure on master... have to nip out for a
couple of hours, but will fix or revert later today.

Jon