Try to autodetect the libiconv
Fix the libiconv check
Merge remote-tracking branch 'upstream/master' into nodups