Update FaureG/O7/apres to 2.18.