Rolled up release to 4.1.1
Merge pull request #257 from pfschwartz/oe4.1.1

Rolled up release to 4.1.1