Update Amethyst to 0.8.6
Merge pull request #4170 from ianyh/master

Update Amethyst to 0.8.6