Update from upstream TheoraPlay