Merge pull request #6538
69c3bde Add some const declarations where they are appropriate. (Daniel Kraft)