Ticket #1718 fixes
Ticket #1718 fixes

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