Merge pull request #1505 from hauke/iotivity