Merge branch 'hotfix/1.2.3'
authorLaury GvR <laury@gaslightmedia.com>
Mon, 12 Sep 2016 15:19:19 +0000 (11:19 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 12 Sep 2016 15:19:19 +0000 (11:19 -0400)

Trivial merge