Merging master in my python3 branch