Merge master to 1.9

Includes changes that should be available in 1.9 also