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

# Conflicts:
#   documentation/description.html
2 jobs for issue-5
in 3 minutes and 1 second, using 0 compute credits, and was queued for 59 seconds