Merge remi-1_8_4.