More Gradle build; 958 tests completed, 238 failed
Merge remote-tracking branch 'origin/trunk' into trunk