Merge the last incomming branch

Merge the incoming branch 18/04/2013