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

2 jobs for issue-9
in 26 seconds, using 0 compute credits, and was queued for 3 seconds