Merge pull request #984 from stweil/const