Merge remote-tracking branch 'remotes/origin/master' into plumfix_mergeable, resolving conflict