Fixed some minors issues where the const qualifier was being discarded.
Merge pull request #219 from fintler/const-qualifier

Fixed some minors issues where the const qualifier was being discarded.
Merge branch 'master' into 2.4dev
Merge pull request #228 from agtorre/2.4dev

Merging updates from master to 2.4dev