merge from sonarsource:master

merging latest changes from sonarsource:master