Amethyst 0.9.4
Merge pull request #6813 from ahbeng/amethyst-0.9.4

Amethyst 0.9.4