Merge branch 'master' of rvb.name:openhab-process