pfSense

Merge remote branch 'mainline/master' into 4_load_balancer_and_services

Conflicts:
usr/local/www/interfaces.php
usr/local/www/interfaces_assign.php
usr/local/www/interfaces_bridge_edit.php
usr/local/www/interfaces_gif_edit.php
usr/local/www/interfaces_gre.php
usr/local/www/interfaces_groups.php
usr/local/www/interfaces_groups_edit.php
usr/local/www/interfaces_lagg.php
usr/local/www/interfaces_lagg_edit.php
usr/local/www/interfaces_ppps.php
usr/local/www/interfaces_ppps_edit.php
usr/local/www/interfaces_qinq.php
usr/local/www/interfaces_vlan.php
usr/local/www/interfaces_vlan_edit.php
usr/local/www/interfaces_wireless.php
usr/local/www/interfaces_wireless_edit.php