Initial message was : [MERGE] merged recent changes from the trunk and adapted build system. [[Imported from SVN: r7344]]