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