Merge branch 'python2compatibility' into 'master'

Python2compatibility

See merge request !99
1 job for master in 32 minutes and 49 seconds (queued for 1 second)