Merge branch 'gb/gitweb-remote-heads'