Merge branch 'hotfix/1.2.8' v1.2.8
authorLaury GvR <laury@gaslightmedia.com>
Thu, 15 Oct 2015 18:01:36 +0000 (14:01 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 15 Oct 2015 18:01:36 +0000 (14:01 -0400)

Trivial merge