Updates for IntelliJ 13.1 support.