Merge branch 'master' into 00000-a-v-s-cleanups
authorWard Vandewege <ward@curoverse.com>
Mon, 17 Apr 2017 00:02:06 +0000 (20:02 -0400)
committerWard Vandewege <ward@curoverse.com>
Mon, 17 Apr 2017 00:02:06 +0000 (20:02 -0400)

Trivial merge