Merge branch 'tz' into gitty
Merge branch 'hunks' into gitty
Merge branch 'ruby2' into gitty