Changelog 20, last before I go to Japan

Signed-off-by: Martin Evans <martindevans@gmail.com>