Ticket #1052. Merge patch referenced in ticket.
Ticket #1052. Merge patch referenced in ticket.

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