f25 back on and r2lab branch merges into plcapi's master