Stealing, stealing, stealing a hot fix from Puppet!
See https://github.com/puppetlabs/puppet/commit/eea1ef5a594c2c9a33cfafac899b1c4317dabc2a for deprecation fix
See http://en.wikipedia.org/wiki/Dumbbell_Indemnity for Simpsons reference! :+1:
Merge pull request #1 from petems/fix_deprecation_message

Fix iconv deprecation message