Merge branch 'hotfix/1.2.22' V1.2.22
authorLaury GvR <laury@gaslightmedia.com>
Thu, 25 May 2017 13:32:11 +0000 (09:32 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 25 May 2017 13:32:11 +0000 (09:32 -0400)

Trivial merge