Merge branch 'UseSWIG-fix-CMP0054-warnings' into release