Fix concatenation of years foir ft
Merge remote-tracking branch 'cgrandin/IPHC-developer' into IPHC-developer