Merge branch 'hotfix/1.2.26' v1.2.26
authorLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 15:50:54 +0000 (11:50 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 15:50:54 +0000 (11:50 -0400)

Trivial merge