commit from UBUNTU 14.10