Created attachment 7977 [details] proposed patch #2 It should apply again. This time the patch is easier to read (no indentation change).