fix timeouts on python3
Merge remote-tracking branch 'LearnProgramming/master'