Branch updated. This should now fix all the problems spotted by James. It still builds fine and all tests pass. -- https://code.launchpad.net/~stgraber/upstart/upstart-dbus-events/+merge/139726 Your team Upstart Reviewers is subscribed to branch lp:upstart.