Initial message was : Merged modification from trunk. Branch is up to date now. [[Imported from SVN: r7289]]