clarification suggested by @ivarne
Merge branch 'upstream-master'