merge upstream/master
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
merge upstream/master
Updated licensing and other project name information in README.
Fix too-precise Test#timeElapsed test which flakes out
when the CI service decides to be slow.
Fix bad whitespace from original test PR.
Fix more bad whitespace.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into bench