Merge branch 'hotfix/1.2.2' v1.2.2
authorLaury GvR <laury@gaslightmedia.com>
Thu, 2 Jul 2015 17:42:51 +0000 (13:42 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 2 Jul 2015 17:42:51 +0000 (13:42 -0400)

Trivial merge