Merge pull request #1250 from kooiot/master