Merge branch 'hotfix/1.2.2' V1.2.2
authorLaury GvR <laury@gaslightmedia.com>
Mon, 23 May 2016 20:23:52 +0000 (16:23 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 23 May 2016 20:23:52 +0000 (16:23 -0400)

Trivial merge