merge master into differential_rotation