1.8.7 support

Closes #19