Merge branch 'hotfix/1.2.9' v1.2.9
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 15:39:24 +0000 (11:39 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 15:39:24 +0000 (11:39 -0400)

Trivial merge