stat

stat
..

..
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/uas/UAS.h
	src/ui/map/QGCMapWidget.cc