merge branch "Ubuntu 14.04 beta" into new branch "beta"