Merge pull request #1173 from Diapolo/init_cpp_comment_upd