Merge "Fix some formatting so GitHub displays it nicely."