3.8: rc6

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>