Merge remote-tracking branch 'origin/master'
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Tue, 15 Sep 2015 13:15:55 +0000 (16:15 +0300)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Tue, 15 Sep 2015 13:15:55 +0000 (16:15 +0300)

Trivial merge