332fb55e3a
Merge revisions from 1362 to revision 1434 from trunk. SVN Revision: 1435
Merge revisions from 1362 to revision 1434 from trunk. SVN Revision: 1435