Merge "Stop NaN being passed to brightness curve." into rvc-dev