Merge audio timing fix branch.