Merge branch 'hotfix/1.0.16' v1.0.16
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Aug 2018 14:19:12 +0000 (10:19 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Aug 2018 14:19:12 +0000 (10:19 -0400)

Trivial merge