Merge proposals dependent on lp:~ptman/hipl/nonetwork

lp:~ptman/hipl/nonetwork has no merge proposals.