Merge branch 'hotfix/1.0.13' v1.0.13
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 26 Jun 2018 19:37:50 +0000 (15:37 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 26 Jun 2018 19:37:50 +0000 (15:37 -0400)

Trivial merge