Merge pull request #1212 from yashodha/trunk