Merge branch 'hotfix/1.0.26' v1.0.26
authorLaury GvR <laury@gaslightmedia.com>
Thu, 21 Jul 2016 12:49:21 +0000 (08:49 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 21 Jul 2016 12:49:21 +0000 (08:49 -0400)

Trivial merge