scripts: sync with master

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
saucy: one native build error down

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