macaque 0.7 & 0.7.1
Merge pull request #2793 from jpdeplaix/macaque-0.7

macaque 0.7 & 0.7.1