Updates to officially support 1.8.7