merge to: 3.14.25-ti-r38

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