value constness fix
Merge remote-tracking branch 'origin/master' into msvc2013
fixes for msvc