3.12: update to latest mainline

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>