PhpStorm 7.1.1
Merge pull request #2602 from Cottser/phpstorm-7.1.1

PhpStorm 7.1.1