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