Merge branch 'master' into kennyyu-deadlock-detector
authorKenny Yu <yu.kenny124@gmail.com>
Fri, 3 Feb 2017 22:24:40 +0000 (14:24 -0800)
committerGitHub <noreply@github.com>
Fri, 3 Feb 2017 22:24:40 +0000 (14:24 -0800)

Trivial merge