Any one for champagne?

Signed-off-by: Gawain Lynch <gawain.lynch@gmail.com>
PR nagging ;-)

Signed-off-by: Gawain Lynch <gawain.lynch@gmail.com>
Tidy karma for self

Signed-off-by: Gawain Lynch <gawain.lynch@gmail.com>