Merge branch 'hotfix/1.2.6' v1.2.6
authorLaury GvR <laury@gaslightmedia.com>
Tue, 13 Sep 2016 16:52:15 +0000 (12:52 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 13 Sep 2016 16:52:15 +0000 (12:52 -0400)

Trivial merge