Merge branch 'master' into bug_374_missingcodecwarning