Merge tag 'v1.5.2' into 'master'

Conflicts:
	CHANGELOG.md
	Rakefile
	lib/bundler/installer.rb
	lib/bundler/rubygems_ext.rb
	lib/bundler/source/rubygems.rb
	spec/realworld/parallel_install_spec.rb
	spec/realworld/parallel_update_spec.rb