Py3 fix, s/func_name/__name__/
Merge branch 'master' into per-task-help-53
More Py3 fixes