Polygon: Merging trunk into the release branch.
Comment out reference to missing test file that was preventing release testing from progressing.