scripts: merge changes from master, too see how bitrotten this is for: alissonwerner

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
scripts: merge changes from master: and this

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