Merge my and Petr's git-merge-one-file-script modifications