Merge remote-tracking branch 'origin/master' appcode/146.1725
authorMax Medvedev <maxim.medvedev@jetbrains.com>
Thu, 5 May 2016 08:18:28 +0000 (11:18 +0300)
committerMax Medvedev <maxim.medvedev@jetbrains.com>
Thu, 5 May 2016 08:18:28 +0000 (11:18 +0300)

Trivial merge