Merge branch 'hotfix/1.2.8' v1.2.8
authorLaury GvR <laury@gaslightmedia.com>
Thu, 15 Sep 2016 15:33:04 +0000 (11:33 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 15 Sep 2016 15:33:04 +0000 (11:33 -0400)

Trivial merge