Sonar 3.6

Update from Sonar 3.5.1 to Sonar 3.6