Merge branch 'test_usercounters' of git://github.com/biojppm/benchmark into biojppm-test_usercounters

This prevents errors when additional non-timing data are present in
the JSON that is loaded, for example when complexity data has been
computed (see #379).

[ci-skip]