Merge "Fix documentaiton formatting errors."