Misc script fixes
Also, grab upstreamCommit
This commit is contained in:

committed by
Marc Baloup

parent
2ffb99b297
commit
b7991a0eaa