Merge remote-tracking branch 'upstream/master' into git.m6w6.name