From: Junio C Hamano <hidden> Date: 2016-06-15 22:48:01
Will replace what was queued on 'pu'.
For [3/7], I had to resolve conflicts in Makefile as it seemt to have been
based on a bit older one. When I push the result out, please verify.
The result merged to 'pu' seems to break t9500 but I didn't look very
carefully.