Merge branch 'py36-compat' into 'master'

Fix compatibility with recent Debian Python 3.6

See merge request !3