Merge branch 'hotfix/1.0.13' v1.0.13
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 9 Feb 2018 20:16:23 +0000 (15:16 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 9 Feb 2018 20:16:23 +0000 (15:16 -0500)

Trivial merge