merge from openhab/openhab