Merge branch 'hotfix/1.0.13' v1.0.13
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 2 Nov 2016 15:32:03 +0000 (11:32 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 2 Nov 2016 15:32:03 +0000 (11:32 -0400)

Trivial merge