master
Complete the Python 2 removal and fix issues found reviewing it
Fixed SF bug #1297 (Python imports)