Merge remote-tracking branch 'origin/master' into mark_folder_as
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 30 Oct 2015 13:33:42 +0000 (14:33 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 30 Oct 2015 13:33:42 +0000 (14:33 +0100)

Trivial merge