Merge branch 'master' into 'production'

PEP8 corrections

See merge request !60
3 jobs for v2.0.2
in 2 minutes and 45 seconds, using 0 compute credits, and was queued for 4 minutes and 47 seconds
latest