Fix for xplat issue #809
response to review feedback
Merge pull request #925 from markcowl/release-0.7.12

Fix for xplat issue #809