Merge remote-tracking branch 'origin/master'
authorAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Thu, 12 Mar 2015 12:09:32 +0000 (15:09 +0300)
committerAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Thu, 12 Mar 2015 12:09:32 +0000 (15:09 +0300)

Trivial merge