Contrib update: fpa-7.x-2.6