Merge pull request #9949 from annando/view-rename