Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.1-pull-reques...