- Merged changes from trunk (885:887)

1 file changed