diff --git a/api/boinc_api.cpp b/api/boinc_api.cpp
index bd4ad09d3c..6462f6a133 100644
--- a/api/boinc_api.cpp
+++ b/api/boinc_api.cpp
@@ -944,8 +944,12 @@ static void handle_process_control_msg() {
 
         if (match_tag(buf, "<resume/>")) {
             BOINCINFO("Received resume message");
-            if (boinc_status.suspended && options.direct_process_action) {
-                resume_activities();
+            if (options.direct_process_action) {
+                if (boinc_status.suspended) {
+                    resume_activities();
+                } else if (suspend_request) {
+                    suspend_request = false;
+                }
             }
             boinc_status.suspended = false;
         }
diff --git a/checkin_notes b/checkin_notes
index 17b9bdf736..b7c1c279bc 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6063,3 +6063,12 @@ David  23 Sept 2012
             prefs.inc
     lib/
         prefs.cpp
+
+David  30 Sept 2012
+    - API: if get a resume message from client while in a critical section,
+        clear the suspend_request flag.
+        Otherwise we'll end up doing two suspends,
+        and on Win the app will be suspended forever.
+
+    api/
+        boinc_api.cpp
diff --git a/doc/get_platforms.inc b/doc/get_platforms.inc
index e67735b9d5..e2e285df46 100644
--- a/doc/get_platforms.inc
+++ b/doc/get_platforms.inc
@@ -34,6 +34,9 @@ function friendly_name($p) {
     case 'windows_amd64': $q = 'Windows/Opteron'; break;
     case 'x86_64-pc-solaris': $q = 'Solaris/x64'; break;
     case 'windows_intelx86_64': $q = 'Windows/x64'; break;
+    case 'arm-android-linux-gnu': $q = 'Android/ARM'; break;
+    case 'arm-unknown-linux-gnu': $q = 'Linux/ARM'; break;
+    case 'x86_64-pc-freebsd': $q = 'FreeBSD/x86'; break;
     }
     if (strlen($pc)) {
         if (strstr($pc, 'cuda')) $q .= " (NVIDIA GPU)";
diff --git a/doc/projects.inc b/doc/projects.inc
index 8c57e6a1d1..446090ee77 100644
--- a/doc/projects.inc
+++ b/doc/projects.inc
@@ -300,6 +300,14 @@ $mixed = array(
 $math = array(
     tra("Mathematics, computing, and games"),
     array(
+        array(
+            "OProject@Home",
+            "http://oproject.goldbach.pl/",
+            tra("Private"),
+            tra("Mathematics, Physics, Artificial Intelligence"),
+            tra("Simulation of quantum computing; Goldbach's conjecture."),
+            "oproject_logo.png"
+        ),
         array(
             "NumberFields@home",
             "http://stat.la.asu.edu/NumberFields/",