Changes merged from the Microsoft 2270 release
Merge pull request #1 from gesquive/master

Changes merged from the Microsoft 2270 release.