Ubuntu 3.1 merge