Merge remote-tracking branch 'origin/master'
authorSergey Malenkov <sergey.malenkov@jetbrains.com>
Thu, 12 Mar 2015 18:28:25 +0000 (21:28 +0300)
committerSergey Malenkov <sergey.malenkov@jetbrains.com>
Thu, 12 Mar 2015 18:28:25 +0000 (21:28 +0300)

Trivial merge