Use const
Merge pull request #7093 from chinhodado/patch-7

Use const