Merge commits from princeton-sns/serval master branch