Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure
authorrtrimana <rtrimana@uci.edu>
Mon, 5 Aug 2019 20:41:18 +0000 (13:41 -0700)
committerrtrimana <rtrimana@uci.edu>
Mon, 5 Aug 2019 20:41:18 +0000 (13:41 -0700)

Trivial merge