[Rails 4.2.0.rc3] - Fixing libiconv missing dependency on OS X Yosemite (10.10.1)
fixed merge conflicts