Merge branch 'master' of https://github.com/dpslavov/openhab into dpslavov-master