Issue #1: merge version with package version becoming .1
Merge branch 'master' of github.com:ThierryGoubier/GitFileTree-MergeDriver
Merge pull request #2 from ThierryGoubier/master

Pick up bugfix for ThierryGoubier/GitFileTree-MergeDriver#1