Merge branch 'mpeg2' into v2.17.x