backport tested okay

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

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