Updated for the 135 branch (IDEA 13.1 release branch)