Merge remote-tracking branch 'remotes/upstream/master'
Merge branch 'master' of https://github.com/planetrenner-martin/openhab
- should not have changed that on 'master'