remove support for 1.8.7
merge