Merging PR #616

This is a big one.

And it's pretty sure to invalidate every other PR in the queue (and vice
versa).

Should we merge this ASAP, and spend the time up to Thursday's call on
rebasing the others?

I think it's pretty important that we get this one in, and *currently*
it merges without conflict.

Harald

Received on Tuesday, 10 May 2016 06:55:51 UTC