Improved logging of iconv failures on OS X
Merge remote-tracking branch 'origin/master'