Merge "resolve python2->python3 issues"