Merge pull request #1553 from evansj/master

Fibaro database fixes