Ubuntu 14.04 changes [in-progress]

Don't merge yet