fixup! 20bce9a switch to trusty
fixup! 20bce9a tweaks