Set content length after a translation
Merge branch 'daley', remote-tracking branch 'origin'