Import python 3 compatbility fixes from downstream#11

arl wants to merge 2 commits intoarl:masterarl/macdeployqtfix:masterfrom

ipsosante:masteripsosante/macdeployqtfix:masterCopy head branch name to clipboard