Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 11 Mar 2016 16:45:56 +0000 (19:45 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 11 Mar 2016 16:45:56 +0000 (19:45 +0300)

Trivial merge