Merge "Fixed some <code> tags for doxygen"