hmm - bad indents seems to have crept in during the meld merge conflict edit, apologies, will fix (so too for comment above)