Merge 1.9.2 into 2.0

All the commits in 1.9-maint up to the 1.9.2 release