Merge branch 'hotfix/1.0.14' v1.0.14
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Feb 2018 12:47:13 +0000 (07:47 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Feb 2018 12:47:13 +0000 (07:47 -0500)

Trivial merge