Merge branch '2.0.0' into test-suite-refactor

Conflicts:
	spec/spec_helper.rb
Finish merge
Merge branch 'test-suite-refactor' into 2.0/remove-rest-api