Merge git://github.com/avuton/flac