merge changes from theora-trunk