Possible fix for #810
Possible fix for #810
Merge remote-tracking branch 'origin/issue-810' into issue-810
Another possible fix for #810
Regenerate build files for #810 [ci skip]
Merge pull request #828 from sjinks/issue-810

Fix for #810 rebased against 1.2.1