Merge the release branch into master
Check before merging:
git diff develop... -U0 --no-color | clang-format-diff.py -p1 -i