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

Trivial merge