Merge branch 'master' into 'production'

Merge master into production for v0.2.1

See merge request !37
1 job for v0.2.1
in 36 seconds, using 0 compute credits, and was queued for 0 seconds
latest