v3.11: rebase

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