Merge branch 'hotfix/1.2.1'
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:51:56 +0000 (12:51 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:51:56 +0000 (12:51 -0400)

Trivial merge