scripts: merge with master

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

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