Fix compatibility with _ahoi_tools 2.1
Merge origin/master