Updated from 1.8.9 to 1.8.13.
Merge branch 'release/1.8.13'