Made r_sanity_check macro have balanced braces.
Removed tab characters from r_sanity_check macro.
Merge branch 'next' into sam_1442
Merge branch 'sam_1442' into next