Merge pull request #4080 from antonlacon/libflac-1.3.x