Merge in the fixed AWB changes from DavidS