Files have changed (?)
Merge from openhab master