Merging changes on master to 1.8.6-p383