Updated to reflect upstream changes.
IntelliJ doing it's thing..