Merge branch 'master' into 'production'

Merge master to production for v0.3.3

See merge request !50
1 job for v0.3.3
in 1 minute and 49 seconds, using 0 compute credits, and was queued for 1 minute and 4 seconds
latest