Merge branch 'develop' into usb-audio-midi

Conflicts:
src/global/defines.h