Merge branch 'hotfix/1.2.2'
authorLaury GvR <laury@gaslightmedia.com>
Wed, 24 Aug 2016 19:10:40 +0000 (15:10 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 24 Aug 2016 19:10:40 +0000 (15:10 -0400)

Trivial merge