Merge branch 'update/6.2.4' into 'master'

Update to v6.2.4

Closes #1

See merge request !10
8 jobs for lolcat42 in 30 seconds (queued for 19 minutes and 7 seconds)