capes: step one import from 3.8

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