Ruby Testing 329
Ruby Testing 329
Merge remote-tracking branch 'origin/master' into origin_master

Conflicts:
	features/step_definitions/QBOT_steps.rb