Merge in 'freeradius-wpe'.