update 1.x with the changes from 2.x