Add P/R from Nico
Merge branch 'master' of github.com:cplusplus/LWG