Merge with master. Version set to 2.4.1.

Version set to 2.4.0

Update package.lock

Move tag v2.3

Version set to 2.2.0

Version set to 2.1.3

Version set to 2.1.2

Version set to 2.1.0

Merge branch 'master' into release-2.0