script: sync with master

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
saucy: yet another build fix for native

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