Update my fork to openhab:master