Merge pull request #1391 from jts-arm/misra

MISRA rule 21.15 fix