Merging v1.9-stable

which will most certainly require some manual intervention.