sync from openhab master