Update to sonar 3.7