Use a different syntax for iconv on Linux.
Replace strings.h with string.h.
Merge branch 'master' into develop