Merge branch 'master' of github.com:CocoaPods/CocoaPods into develop

* 'master' of github.com:CocoaPods/CocoaPods:
  Array#flatten! returns nil if no modifications were made (i.e., array contains no subarrays.)

lib/cocoapods/local_pod.rb

@@ -305,7 +305,7 @@ module Pod
 
       all_specs = [ top_specification ] + top_specification.subspecs
       options   = {:glob => '*.{h}'}
-      files     = paths_by_spec(:source_files, options, all_specs).values.flatten!
+      files     = paths_by_spec(:source_files, options, all_specs).values.flatten
       headers   = files.select { |f| f.extname == '.h' }
       headers
     end