* Resync with lp:~upstart-devel/upstart/1.6.