- Merged changes 882:885 from trunk

3 files changed