Merge remote-tracking branch 'origin/master' into mark_folder_as appcode/144.1326 clion/144.1328
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 20 Nov 2015 19:56:31 +0000 (20:56 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 20 Nov 2015 19:56:31 +0000 (20:56 +0100)

Trivial merge