Merge pull request #4386 from FernetMenta/flac