Change spaces to tabs - on previous checkin to Protect against null SetpointType
Merge branch 'master' of https://github.com/jonwsmith/openhab