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