Initial message was : Merged revisions r1563 to r1582 from trunk to sync the branch. [[Imported from SVN: r1806]]