Merge branch 'fix-nosfx' of git://github.com/aroben/msysgit into devel