scripts: sync with master

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

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