Merge branch 'kantp-master'
authorRyan Scott <ryan.gl.scott@gmail.com>
Mon, 24 Jul 2017 20:33:42 +0000 (16:33 -0400)
committerRyan Scott <ryan.gl.scott@gmail.com>
Mon, 24 Jul 2017 20:33:42 +0000 (16:33 -0400)

Trivial merge