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

Trivial merge