Mege 2.1.0 changes into master

This is probably the last merge from 2.1 into master. From now on we'll only merge 2.1-no-bin-compat with bugfixes.

No review.