* 'master' of https://github.com/apalancat/CocoaPods:
  Test and documentation for issue #1694
  Unset the `CDPATH` env variable before shelling-out. #1694

Conflicts:
	CHANGELOG.md