Merge "Switch from block comments to line comments"