Merge master (@ C block style tweaks)