Merge branch 'master' into 'production'

Release 2.0.0

See merge request !113
2 jobs for v2.0.0
in 8 minutes and 47 seconds, using 0 compute credits, and was queued for 10 minutes and 13 seconds
latest