Merge remote-tracking branch 'origin/master' phpstorm/163.214
authorValentina Kiryushkina <valentina.kiryushkina@jetbrains.com>
Wed, 15 Jun 2016 13:12:21 +0000 (16:12 +0300)
committerValentina Kiryushkina <valentina.kiryushkina@jetbrains.com>
Wed, 15 Jun 2016 13:12:21 +0000 (16:12 +0300)

Trivial merge