Merge with openhab master
Merge branch 'master' of github.com:dereulenspiegel/openhab