merged with trunk, revisions 901-902 (for issue 1 - Linux compatibility)