commit from ubuntu 12.4