Merge branch 'suppress-createimage2d-deprecation-warning'