Update to Sonar 3.5-RC1