upgrade master to 1.5.x