final merge of changes from the end of the flac 1.0.4 maintenance branch