- Constness
- Added my name to TODO comment
Merge remote-tracking branch 'upstream/master'