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

# Conflicts:
#   documentation/description.html