Minor release to improve portability.
Merge pull request #3174 from tbrk/master

Minor release to improve portability.