Make it compile
Merge pull request #2768 from fluffyfreak/no-or

Make it compile again
Merge branch 'master' of https://github.com/pioneerspacesim/pioneer into gas_giant_stripes