Convert some // comments into /* */ comments.
(Except in the iOS-specific code, because we know the iOS compiler
can take it.)
Merge branch 'master' into debugger