Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 10 Mar 2016 22:15:23 +0000 (01:15 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 10 Mar 2016 22:15:23 +0000 (01:15 +0300)

Trivial merge