Merge "Keep track of braces {} in @code comments"
am: 55f102d9b4

* commit '55f102d9b432c53e25ed2afd4b83488a7c2b44d8':
  Keep track of braces {} in @code comments