Merge remote branch 'upstream/master'
Conflicts: usr/local/www/status_rrd_graph_img.php usr/local/www/themes/pfsense_ng/rrdcolors.inc.php
Merge remote branch 'upstream/master'
Conflicts:
usr/local/www/status_rrd_graph_img.php
usr/local/www/themes/pfsense_ng/rrdcolors.inc.php