9.1.2: all python3 branches merged