Merge branch 'release/1.0.12' v1.0.12
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 26 Jun 2018 19:23:04 +0000 (15:23 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 26 Jun 2018 19:23:04 +0000 (15:23 -0400)

Trivial merge