merge master to 1.2

Anything in here look undesirable in a 1.2.11 release? Appreciate other eyes scanning through the commits, especially commits you made.