Merge branch 'maint'

diff --cc isl_arg.c
Simple merge

diff --cc isl_ast_graft.c
Simple merge

diff --cc isl_map.c
Simple merge

diff --cc isl_map_simplify.c
Simple merge

diff --cc isl_test.c
Simple merge