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

Trivial merge