Merge remote-tracking branch 'upstream/master'

Conflicts:
test/integration/default/serverspec/spec_helper.rb
test/integration/ui/serverspec/spec_helper.rb