Merge remote-tracking branch 'origin/master' phpstorm/162.725
authorMax Medvedev <maxim.medvedev@jetbrains.com>
Thu, 2 Jun 2016 10:50:28 +0000 (13:50 +0300)
committerMax Medvedev <maxim.medvedev@jetbrains.com>
Thu, 2 Jun 2016 10:50:28 +0000 (13:50 +0300)

Trivial merge