PhpStorm 7.1.2
Merge pull request #2887 from edwinkcw/phpstorm-7.1.2

PhpStorm 7.1.2