Merge branch 'hotfix/1.0.16' v1.0.16
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 15 Mar 2018 15:40:30 +0000 (11:40 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 15 Mar 2018 15:40:30 +0000 (11:40 -0400)

Trivial merge