Merge "Allow specifications for a function to be found in more than one spec file."