Merge branch 'hotfix/1.2.2' v1.2.2
authorLaury GvR <laury@gaslightmedia.com>
Mon, 11 Jul 2016 15:42:06 +0000 (11:42 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 11 Jul 2016 15:42:06 +0000 (11:42 -0400)

Trivial merge