Merge tag 'v1.0.26' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 21 Jul 2016 12:49:25 +0000 (08:49 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 21 Jul 2016 12:49:25 +0000 (08:49 -0400)
v1.0.26


Trivial merge