merge in fixes between rc2/rc3

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
3.13-rc3-armv7-x3 release

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