Revert "Revert "Merge remote-tracking branch 'remotes/origin/reloadBlame' into svn-merge-info""

This reverts commit 20ae30d41ef7d78be2ad0eacb540ff6aa7021968.