Merge branch 'hotfix/1.0.13' v1.0.13
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 24 Jun 2016 12:12:02 +0000 (08:12 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 24 Jun 2016 12:12:02 +0000 (08:12 -0400)

Trivial merge