Review: Approve Tested on/off-path building and seems to work. I also tested binaries on Ubuntu and seems still working. Please consider more atomic commits even though you're working on a branch. If Diego has further clean up items, feel free to commit smaller fixes directly to trunk. Since autobuilder is failing on trunk, I'd suggest to merge asap. P.S. What were the dead options? -- https://code.launchpad.net/~ptman/hipl/tests/+merge/103985 Your team HIPL core team is subscribed to branch lp:hipl.