Bringing the ubuntu branch up to date