Merge from OVH svn server