Amethyst 0.9
Merge pull request #6412 from ahbeng/amethyst-0.9

Amethyst 0.9