Still trying to keep the 1.8.7 support up