merge to: 3.14.26-ti-r40

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