7db7922f9e
merge after 2.2.7 (I was wondering why that bug looked so familiar!). Also update some docs accordingly.
merge after 2.2.7 (I was wondering why that bug looked so familiar!). Also update some docs accordingly.