Merge branch 'py3' into 'master'

Improve py3 compatibility

See merge request !7
15 jobs for master in 6 minutes and 40 seconds (queued for 8 seconds)