Merge remote-tracking branch 'origin/master'
authorVasily Pisar <vasily.pisar@jetbrains.com>
Thu, 29 Oct 2015 15:26:30 +0000 (18:26 +0300)
committerVasily Pisar <vasily.pisar@jetbrains.com>
Thu, 29 Oct 2015 15:26:30 +0000 (18:26 +0300)

Trivial merge