Develop to master before Python 3 compatibility milestone