Fix tag encoding.
Merge branch 'develop' into ffmpeg