Merge branch 'master' into new
-rwxr-xr-x 143787 gitk