merge in: imx_3.0.35_1.1.0 branch

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