Merge branch 'hotfix/1.0.16' v1.0.16
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 Jul 2018 17:42:42 +0000 (13:42 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 Jul 2018 17:42:42 +0000 (13:42 -0400)

Trivial merge