Update to 2.1.2
Merge pull request #9364 from pcolton/master

Update to 2.1.2