Merge master into differential_rotation feature branch