Add missing file which mysteriously disappeared in a merge