Merge "Bugfix: correct a typo in the yardstick userguide"