Updated master branch to upstream master

... and reverted transparent flarm radar commit.