Merge pull request #1335 from ariscop/CMP0065