Merged branch 0.18.1

Conflicts:
	lib/cocoapods-core.rb