fix for OS X
Merge remote-tracking branch 'origin/sonar_array' into flow_test
fix config for px4flow; flow works
Merge remote-tracking branch 'origin/flow_test'