Add some const qualifiers.
Merge branch 'gitmaster' into master-merge