Merge tag 'v1.2.26' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 15:51:00 +0000 (11:51 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 15:51:00 +0000 (11:51 -0400)
v1.2.26


Trivial merge