Pull from upstream dev branch

Periodic merge; contains a bunch of package/supervisor fixes and a new "native linux" target.