Merge remote-tracking branch 'intrigeri/fix_diffurl_vs._cgit'