Merge branch 'master' into uavcan

src/drivers/px4fmu/fmu.cpp

@@ -559,13 +559,12 @@ PX4FMU::task_main()
 		}
 
 		/* sleep waiting for data, stopping to check for PPM
-		 * input at 100Hz */
+		 * input at 50Hz */
 		int ret = ::poll(_poll_fds, _poll_fds_num, CONTROL_INPUT_DROP_LIMIT_MS);
 
 		/* this would be bad... */
 		if (ret < 0) {
 			log("poll error %d", errno);
-			usleep(1000000);
 			continue;
 
 		} else if (ret == 0) {

src/modules/mavlink/mavlink_main.cpp

@@ -1535,6 +1535,8 @@ Mavlink::mavlink_missionlib_send_gcs_string(const char *string)
 {
 	const int len = MAVLINK_MSG_STATUSTEXT_FIELD_TEXT_LEN;
 	mavlink_statustext_t statustext;
+	statustext.severity = MAV_SEVERITY_INFO;
+
 	int i = 0;
 
 	while (i < len - 1) {