Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure
authorbdemsky <bdemsky@uci.edu>
Tue, 6 Aug 2019 19:45:49 +0000 (12:45 -0700)
committerbdemsky <bdemsky@uci.edu>
Tue, 6 Aug 2019 19:45:49 +0000 (12:45 -0700)

Trivial merge