commit from ubuntu 14.10