3.8: merge in all cape changes up to bone62

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