diff --git a/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.cpp b/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.cpp
index 054fefd70..530bb543e 100644
--- a/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.cpp
+++ b/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.cpp
@@ -49,6 +49,7 @@ GeneralSettings::GeneralSettings() :
     m_autoSelect(true),
     m_useUDPMirror(false),
     m_useExpertMode(false),
+    m_collectUsageData(true),
     m_dialog(0)
 {}
 
@@ -125,6 +126,7 @@ QWidget *GeneralSettings::createPage(QWidget *parent)
     m_page->checkAutoSelect->setChecked(m_autoSelect);
     m_page->cbUseUDPMirror->setChecked(m_useUDPMirror);
     m_page->cbExpertMode->setChecked(m_useExpertMode);
+    m_page->cbUsageData->setChecked(m_collectUsageData);
     m_page->colorButton->setColor(StyleHelper::baseColor());
 
     connect(m_page->resetButton, SIGNAL(clicked()), this, SLOT(resetInterfaceColor()));
@@ -145,6 +147,7 @@ void GeneralSettings::apply()
     m_useExpertMode = m_page->cbExpertMode->isChecked();
     m_autoConnect   = m_page->checkAutoConnect->isChecked();
     m_autoSelect    = m_page->checkAutoSelect->isChecked();
+    m_collectUsageData = m_page->cbUsageData->isChecked();
 }
 
 void GeneralSettings::finish()
@@ -161,6 +164,7 @@ void GeneralSettings::readSettings(QSettings *qs)
     m_autoSelect    = qs->value(QLatin1String("AutoSelect"), m_autoSelect).toBool();
     m_useUDPMirror  = qs->value(QLatin1String("UDPMirror"), m_useUDPMirror).toBool();
     m_useExpertMode = qs->value(QLatin1String("ExpertMode"), m_useExpertMode).toBool();
+    m_collectUsageData = qs->value(QLatin1String("CollectUsageData"), m_collectUsageData).toBool();
     qs->endGroup();
 }
 
@@ -179,6 +183,7 @@ void GeneralSettings::saveSettings(QSettings *qs)
     qs->setValue(QLatin1String("AutoSelect"), m_autoSelect);
     qs->setValue(QLatin1String("UDPMirror"), m_useUDPMirror);
     qs->setValue(QLatin1String("ExpertMode"), m_useExpertMode);
+    qs->setValue(QLatin1String("CollectUsageData"), m_collectUsageData);
     qs->endGroup();
 }
 
@@ -249,6 +254,11 @@ bool GeneralSettings::useUDPMirror() const
     return m_useUDPMirror;
 }
 
+bool GeneralSettings::collectUsageData() const
+{
+    return m_collectUsageData;
+}
+
 bool GeneralSettings::useExpertMode() const
 {
     return m_useExpertMode;
diff --git a/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.h b/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.h
index b03e71704..01c1c5f70 100644
--- a/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.h
+++ b/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.h
@@ -57,6 +57,7 @@ public:
     bool autoConnect() const;
     bool autoSelect() const;
     bool useUDPMirror() const;
+    bool collectUsageData() const;
     void readSettings(QSettings *qs);
     void saveSettings(QSettings *qs);
     bool useExpertMode() const;
@@ -79,6 +80,7 @@ private:
     bool m_autoSelect;
     bool m_useUDPMirror;
     bool m_useExpertMode;
+    bool m_collectUsageData;
     QPointer<QWidget> m_dialog;
     QList<QTextCodec *> m_codecs;
 };
diff --git a/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.ui b/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.ui
index 6eda799c1..2a727171f 100644
--- a/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.ui
+++ b/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.ui
@@ -11,7 +11,16 @@
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
@@ -20,17 +29,73 @@
       <string>General settings</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="1" column="0">
-       <widget class="QLabel" name="colorLabel">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_3">
         <property name="text">
-         <string>User interface color:</string>
+         <string>Language:</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
+      <item row="14" column="0">
+       <widget class="QLabel" name="labelExpert">
+        <property name="text">
+         <string>Expert Mode:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="13" column="2">
+       <widget class="QCheckBox" name="cbUseUDPMirror">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="12" column="2">
+       <widget class="QCheckBox" name="checkAutoSelect">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="11" column="0">
+       <widget class="QLabel" name="label_5">
+        <property name="text">
+         <string>Automatically connect an OpenPilot USB device:</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="10" column="2">
+       <widget class="QCheckBox" name="checkBoxSaveOnExit">
+        <property name="text">
+         <string/>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
        <widget class="QWidget" name="widget" native="true">
         <layout class="QGridLayout" name="gridLayout_2">
-         <property name="margin">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
           <number>0</number>
          </property>
          <item row="0" column="1">
@@ -82,46 +147,46 @@
         </layout>
        </widget>
       </item>
-      <item row="9" column="1">
+      <item row="1" column="0">
+       <widget class="QLabel" name="colorLabel">
+        <property name="text">
+         <string>User interface color:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="15" column="0">
+       <widget class="QLabel" name="labelExpert_2">
+        <property name="text">
+         <string>Gather and upload usage data:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="9" column="2">
        <widget class="QWidget" name="widget_2" native="true">
         <layout class="QGridLayout" name="gridLayout_3">
-         <property name="margin">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
           <number>0</number>
          </property>
         </layout>
        </widget>
       </item>
-      <item row="10" column="1">
-       <widget class="QCheckBox" name="checkBoxSaveOnExit">
+      <item row="14" column="2">
+       <widget class="QCheckBox" name="cbExpertMode">
         <property name="text">
          <string/>
         </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
        </widget>
       </item>
-      <item row="10" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>Save configuration settings on exit:</string>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="11" column="0">
-       <widget class="QLabel" name="label_5">
-        <property name="text">
-         <string>Automatically connect an OpenPilot USB device:</string>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="11" column="1">
+      <item row="11" column="2">
        <widget class="QCheckBox" name="checkAutoConnect">
         <property name="text">
          <string/>
@@ -131,58 +196,14 @@
         </property>
        </widget>
       </item>
-      <item row="12" column="0">
-       <widget class="QLabel" name="label_6">
-        <property name="text">
-         <string>Automatically select an OpenPilot USB device:</string>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="12" column="1">
-       <widget class="QCheckBox" name="checkAutoSelect">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="13" column="1">
-       <widget class="QCheckBox" name="cbUseUDPMirror">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
       <item row="13" column="0">
        <widget class="QLabel" name="labelUDP">
         <property name="text">
-         <string>Use UDP Mirror</string>
+         <string>Use UDP Mirror:</string>
         </property>
        </widget>
       </item>
-      <item row="14" column="0">
-       <widget class="QLabel" name="labelExpert">
-        <property name="text">
-         <string>Expert Mode</string>
-        </property>
-       </widget>
-      </item>
-      <item row="14" column="1">
-       <widget class="QCheckBox" name="cbExpertMode">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
+      <item row="0" column="2">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QComboBox" name="languageBox"/>
@@ -202,10 +223,33 @@
         </item>
        </layout>
       </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_3">
+      <item row="10" column="0">
+       <widget class="QLabel" name="label_4">
         <property name="text">
-         <string>Language:</string>
+         <string>Save configuration settings on exit:</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="12" column="0">
+       <widget class="QLabel" name="label_6">
+        <property name="text">
+         <string>Automatically select an OpenPilot USB device:</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="15" column="2">
+       <widget class="QCheckBox" name="cbUsageData">
+        <property name="text">
+         <string/>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
         </property>
        </widget>
       </item>