Merge branch 'hotfix/1.0.13' v1.0.13
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 13:17:46 +0000 (09:17 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 13:17:46 +0000 (09:17 -0400)

Trivial merge