Ignore benchmark.py
Rejigger comments
Merge remote-tracking branch 'upstream/aries' into aries