Update Amethyst to 0.8.5
Merge pull request #3862 from ianyh/master

Update Amethyst to 0.8.5