Re #940 - Merging in Git is a disaster...