from Simon Wilkinson <sxw@inf.ed.ac.uk>: fix configuration file merging