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)
commit6f2ad3024c3d5e360c44c1ea522534b270c22159
treed180dd5cbe80690a389fafddef109aaa330bcfec
parentaf2b1560f26fc9b65a1887ed1d888666a371bd77
parente1b25421a980a37c08967a1c6c6e830f2256c0bf
Merge branch 'kantp-master'