3.8: update to 3.8.7

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