Merge branch 'hotfix/1.0.16' v1.0.16
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 1 Jun 2018 20:45:11 +0000 (16:45 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 1 Jun 2018 20:45:11 +0000 (16:45 -0400)

Trivial merge