Merge the latest FreeRADIUS 2.x code.