Merge remote-tracking branch 'upstream/master' into intel-extreme

Add a MIME type to network_settings add-ons

* This is required for localization to work.