Merge branch 'master' into new
tree61b32d41fbf8c3b7d603d26d68a954f2d50bd8f7
-rwxr-xr-x 116264 gitk