Merge branch 'hotfix/1.1.23' v1.1.23
authorLaury GvR <laury@gaslightmedia.com>
Fri, 2 Jun 2017 15:23:32 +0000 (11:23 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 2 Jun 2017 15:23:32 +0000 (11:23 -0400)

Trivial merge