Merge branch 'hotfix/1.2.7'
authorLaury GvR <laury@gaslightmedia.com>
Thu, 15 Sep 2016 15:30:49 +0000 (11:30 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 15 Sep 2016 15:30:49 +0000 (11:30 -0400)

Trivial merge