Merge remote-tracking branch 'origin/master'
authorVasily Pisar <vasily.pisar@jetbrains.com>
Thu, 23 Jun 2016 14:01:03 +0000 (17:01 +0300)
committerVasily Pisar <vasily.pisar@jetbrains.com>
Thu, 23 Jun 2016 14:01:03 +0000 (17:01 +0300)

Trivial merge