Merge branch 'hotfix/1.0.14' v1.0.14
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 29 Jan 2019 17:15:48 +0000 (12:15 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 29 Jan 2019 17:15:48 +0000 (12:15 -0500)

Trivial merge