issue2 partial fix
another hot fix
Merge branch 'master' into issue2
issue 2 completely fix
opendiff test
what difftool to use
conflicts resolved
master diffmerge