Merge pull request #818 from jtwigg/v1.2

V1.2.1 merge Hotfix.