merged with trunk, revision 899 (for issue 2 - Linux compatibility)