Update to Sonar 3.6-RC3.