Updated from 1.8.7.2 to 1.8.7.11.
Merge branch 'release/1.8.7.11'