no need to make const something that's already const
Merge branch 'master' into c++1y