Merge branch 'master' into new
tree4961b148777af04b318163c30ef636e695bf3786
-rwxr-xr-x 150117 gitk