The following commits were skipped: 99e2ad9e Improve GC+Cairo workaround e0862eda Work around GC+Cairo bug