Trunk

Closes https://github.com/CocoaPods/CocoaPods/issues/2151

@alloy I letting the merge to you in case you have any final requirement.