3.11: update to 3.10-final

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