Merge "Made BagOStuff::merge() take any callable"