Merge tag 'v1.0.26' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jul 2016 13:50:03 +0000 (09:50 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jul 2016 13:50:03 +0000 (09:50 -0400)
v1.0.26


Trivial merge