Trust the laser sensor more
Merge branch 'terrainaltfield' into fwlandingterrain
Merge remote-tracking branch 'upstream/fwlandingterrain' into fwlandingterrain
fw landing: impose horizontal limit for start of flare
Merge remote-tracking branch 'upstream/master' into fwlandingterrain

Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
Merge branch 'flarehorizontallimit' into fwlandingterrain

Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
Merge remote-tracking branch 'upstream/master' into fwlandingterrain
fw landing: horiz flare check: fix wp distance

better calculation of wp distance when behind wp
make flare pitch angle a param
Merge branch 'fwlandingterrain' of github.com:PX4/Firmware into landing