Merge pull request #1227 from antonlacon/libvorbis-1.3.x