Merge master into develop

Now that we have released, let's merge master into develop.

There is a file scratchpad/ix2019-sounds.org which is in master only. This file will now be part of develop as well, and we can remove it at a later date if we want.