changes for 2.1.0 (to be applied to master)#9

bill-torpey wants to merge 6 commits intomasternyfix/OZ:masterfrom

release/2.1.0nyfix/OZ:release/2.1.0Copy head branch name to clipboard