Merge branch 'hotfix/1.0.14' v1.0.14
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 13 Mar 2018 15:29:57 +0000 (11:29 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 13 Mar 2018 15:29:57 +0000 (11:29 -0400)

Trivial merge