Merge branch 'hotfix/2.1.23' v2.1.23
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 13:31:13 +0000 (09:31 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 13:31:13 +0000 (09:31 -0400)

Trivial merge