Merge "Allow libfec to correct bad blocks"