- Imported fix from trunk
 - Imported fix from trunk

3 files changed