Merge branch 'hotfix/1.2.23' V1.2.23
authorLaury GvR <laury@gaslightmedia.com>
Wed, 21 Jun 2017 17:51:37 +0000 (13:51 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 21 Jun 2017 17:51:37 +0000 (13:51 -0400)

Trivial merge