update version to 1.8.7
Merge remote-tracking branch 'origin/master' into master-github