Sync up with remi-1_6_9.