Merge remote-tracking branch 'origin/master' into development
Fix some issues caused by uncrustify.
Merge branch 'development'