merged with trunk, revisions 894-897 (for issue 2 - ensuring compatibility with Linux)