FIxes after merge
FIxes after merge

dennypage/pfsense,ch1c4um/pfsense,phil-davis/pfsense,phil-davis/pfsense,dennypage/pfsense,jxmx/pfsense,brunostein/pfsense,ptorsten/pfsense,pfsense/pfsense,pfsense/pfsense,BlackstarGroup/pfsense,ch1c4um/pfsense,dennypage/pfsense,brunostein/pfsense,jxmx/pfsense,BlackstarGroup/pfsense,phil-davis/pfsense,NewEraCracker/pfsense,brunostein/pfsense,NewEraCracker/pfsense,phil-davis/pfsense,dennypage/pfsense,NOYB/pfsense,pfsense/pfsense,BlackstarGroup/pfsense,NOYB/pfsense,NewEraCracker/pfsense,NewEraCracker/pfsense,BlackstarGroup/pfsense,ch1c4um/pfsense,ch1c4um/pfsense,NOYB/pfsense,jxmx/pfsense,ptorsten/pfsense,ptorsten/pfsense,pfsense/pfsense