Manually merge graemef https://github.com/flavour/eden/pull/470