Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 25 Mar 2015 11:42:43 +0000 (14:42 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 25 Mar 2015 11:42:43 +0000 (14:42 +0300)

Trivial merge