Test branch 1.9 merge

Merging test branch 1.9 into master for release of the new 1.9 version.