Merge remote-tracking branch 'remotes/vivier2/tags/trivial-patches-pull-request'...