Merge branch 'develop-v2.1.1' into issue-16

2 jobs for issue-16
in 28 seconds, using 0 compute credits, and was queued for 2 seconds