Merge branch 'master' into fix_order
authorClark Barrett <barrett@cs.stanford.edu>
Mon, 12 Dec 2016 02:21:52 +0000 (18:21 -0800)
committerGitHub <noreply@github.com>
Mon, 12 Dec 2016 02:21:52 +0000 (18:21 -0800)

Trivial merge