Merge remote-tracking branch 'origin/master' clion/171.1017 dbe/171.1019
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Wed, 16 Nov 2016 11:52:41 +0000 (14:52 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Wed, 16 Nov 2016 11:52:41 +0000 (14:52 +0300)

Trivial merge