Merge branch 'hotfix/1.0.14' v1.0.14
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Mar 2018 20:18:03 +0000 (15:18 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Mar 2018 20:18:03 +0000 (15:18 -0500)

Trivial merge