Merge branch 'develop'

Conflicts:
ReleaseNotes.md
src/FIRMWARE-VERSION