Const correctness!
Merge pull request #2244 from jacquesg/const-correctness

Const correctness!