Update clar to b3ef9e0
Apply git_patch's created by diff