Merge remote-tracking branch 'upstream/master' into roles

No conflicts.