Update benchmarker.py
Merge branch 'master' into travis-hotfix