Merge branch 'jc/same-encoding'