Upstream Merge from launchpad rev 56