Merge branch 'hotfix/1.0.14' v1.0.14
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 12 Jul 2018 19:34:09 +0000 (15:34 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 12 Jul 2018 19:34:09 +0000 (15:34 -0400)

Trivial merge