Merge branch '21d-branch' into 'master'

Update version numbers for 21d.

See merge request !43
2 jobs for master in 17 minutes and 44 seconds (queued for 1 second)
Status Name Job ID Coverage
  Test
passed linux-runner #1176
linux

00:17:44

passed osx-runner #1177
osx

00:08:37