Merge branch 'master' into traff/python-facet clion/171.3564 clion/171.3597
authorAlexey Utkin <alexey.utkin@jetbrains.com>
Mon, 20 Feb 2017 18:40:57 +0000 (21:40 +0300)
committerAlexey Utkin <alexey.utkin@jetbrains.com>
Mon, 20 Feb 2017 18:40:57 +0000 (21:40 +0300)

Trivial merge