Merge branch 'hotfix/1.0.14' v1.0.14
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 26 Jun 2018 19:44:00 +0000 (15:44 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 26 Jun 2018 19:44:00 +0000 (15:44 -0400)

Trivial merge