Merge pull request #3622 from rolfbjarne/remove-stray-file