COMP: help MSVC parser with */* problem
Merge branch 'bug-18548-cleanup-warnings'