Constness.
Merge upstream branch 'chris/master'