Merge branch 'hotfix/1.0.13' v1.0.13
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 6 Feb 2018 21:10:18 +0000 (16:10 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 6 Feb 2018 21:10:18 +0000 (16:10 -0500)

Trivial merge