Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure