Merge branch 'bug_374_missingcodecwarning' into experimental