merge to: 3.14.19-ti-r29

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