merge to: 3.14.17-ti-r18

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