Merge in proftbd parser