This commit is upto-date with following the commit in upstream-master
Branch: upstream-master
commit: ce6dd6b5732e319ef60716d9cc9af6a836a4011a

upstream-master is in sync with upstream project at
URL: https://github.com/xiph/flac.git

