Rev master to 1.9.x