Contrib update: speedy-7.x-1.8