Merge pull request #3951 from antonlacon/libopus-1.1.x