Merge branch 'hotfix/1.0.19' v1.0.19
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 14 Jul 2016 12:18:41 +0000 (08:18 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 14 Jul 2016 12:18:41 +0000 (08:18 -0400)

Trivial merge