Pull in updates from Launchpad
Merge branch '4.2/launchpad-sync' into 4.2-trunk