Merge branch 'master' into ignore-isl-identifiers