merge with openhab master