Merge remi-1_8.