commit from ubuntu 12.2