dos2unix got rid of ^Ms in some files
Merge branch 'master' of https://github.com/parawizard/pfsense-packages