Vitor Pamplona 1767555802 Merged https://github.com/vitorpamplona/amethyst/commit/eeafeeff1739f06c6ba10d3b04090cf9dae1042c
