Something weird

I did something and something unexpected happened here at github... I don't want to mess up your repository so here is pull request. Everything should be fine now yet there is couple of extra merge-commits.

Main reason for this push is: https://github.com/terribl/dump1090/commit/6bf2f2b54b3b71d1a7cf3592342f866f525b2a7d