Update Amethyst to 0.8.4
Merge pull request #3329 from ianyh/master

Update Amethyst to 0.8.4