fixed http://youtrack.jetbrains.com/issue/MPS-19042
Merge remote-tracking branch 'origin/master'