Merge branch 'master' of github.com:PX4/Firmware into power_enforce

src/modules/mc_pos_control/mc_pos_control_main.cpp

@@ -466,7 +466,7 @@ MulticopterPositionControl::update_ref()
 {
 	if (_local_pos.ref_timestamp != _ref_timestamp) {
 		double lat_sp, lon_sp;
-		float alt_sp;
+		float alt_sp = 0.0f;
 
 		if (_ref_timestamp != 0) {
 			/* calculate current position setpoint in global frame */

src/systemcmds/nshterm/nshterm.c

@@ -60,7 +60,7 @@ nshterm_main(int argc, char *argv[])
         printf("Usage: nshterm <device>\n");
         exit(1);
     }
-    uint8_t retries = 0;
+    unsigned retries = 0;
     int fd = -1;
 
     /* try the first 30 seconds */