commit from precise
fixed merge