Merge pull request #1198 from bradymiller/fix-issue-1183_1