Merge 2.10

The only commit no-op merged into master: ec89b59717
There was a conflict in the deleted starr.number.

review by @gkossakowski