- Imported fix from trunk

3 files changed