Merge branch 'fix-resource-warnings' into 1.3.0-candidate

This fixes most, but not all, of the ResourceWarnings under 3.2 and 3.3.