Bind info-display-manual to C-h C-i
Merge remote-tracking branch 'upstream/master'